2.0.7

Merge branch 'develop' into release-2.0.7

What's Changed

• Changed routing to support a catch all style by @TomPallister in #187
• Feature/fix #185 round 2 by @TomPallister in #188

Full Changelog: 2.0.6...2.0.7