Fixed bug with waypoint being announced twice
Merge pull request #805 from Bars107/refactor

Fixed bug with waypoint being announced twice