Merge pull request #44 from ARTFL-Project/master

Update downstream
fix bug in navigation
Merge pull request #236 from clovis/master

Fix another bug in navigation