Add ability to collect routes from several files.
Small tweaks
Merge pull request #42 from fredwu/pr/39

Pr/39