merging to master to fix waypoints