fixed the route resolve() issue.

Fixes #218
Merge remote-tracking branch 'origin/master'