Fixes issue #388
Added the ability to include custom routes with a theme
Merge pull request #410 from molovo/dev

Small fixes