Merge pull request #3 from massiveart/feature/navigation

Feature/navigation