Merge pull request #5 from massiveart/feature/navigation

Feature/navigation