added support for navigation

fix #35, fix #34