update routes
Merge branch 'master' into update_routes
Merge pull request #60 from iTakeshi/update_routes

update routes