minor bug fixes
Merge branch 'master' of github.com:ishanthukral/where-am-i

merge