bug fix routes
fix route
test
route fix
Type path fix
Merge remote-tracking branch 'origin/development' into gh-pages