Merge changes onto master
Merge branch 'master' of https://github.com/Dareryan/Shortpath