Merge pull request #4 from rongierlach/master

Merge pull request #3 from rongierlach/Routes
Merge pull request #6 from rongierlach/Routes

Merge pull request #4 from rongierlach/master