- Added option display_wpt to choose between display waypoints or not!