Fixes #17 - throttle navigation
Merge branch 'release'