Merge pull request #18 from hpence/develop

Route naming fix and more code cleanup