Merge pull request #184 from SUNY-Albany-CCI-INF362/master

update this branch
Merge pull request #201 from SUNY-Albany-CCI-INF362/navigation-fix

Merge pull request #184 from SUNY-Albany-CCI-INF362/master