Strips out optional parameters on a route now if not supplied
Merge fix
Merge branch 'stanfieldr-master'