Close #86
Merge branch 'nav-to-profile' into development