Merge branch 'develop' for route hotfix.
Merge branch 'master' of github.com:calvinszeto/hibbert