Added Waypoints 2.0.2
Merge pull request #1207 from circuuz/master

Waypoints 2.0.2