Fix Issue #101
Update routes