change to save routes
Merge branch 'dev' of github.com:vjustov/Hitchhiker into dev