Minor updates.
Updated routing.
Merge pull request #29 from sorniels/master

Updated routing.