Minor refactoring. Forgot to add Waypoints list to result.
Merge pull request #2 from collinprice/master

Minor refactoring. Forgot to add Waypoints list to result.