The match methods now makes more send

The match methods now uses a custom RouteAttribute, for mapping routes
=> methods
Merge branch 'development'