removed assertion, fixed waypoints in ff
Merge pull request #13 from goinstant/waypoints-fix

removed assertion, fixed waypoints in ff