Extended Walfisch-Bertoni Propagation Model to cover Short Range and Millimeter-wave bands