Changed routing method
Merge branch 'overhaul' of github.com:behance/singularity into overhaul