New navigation
Merge from master
Merge pull request #21 from daklaw/fix-navigation

Fix navigation