Merge pull request #4 from brian978/develop

Added improvements
Merge branch 'develop' into enhancement/improve-route-matching