Merge branch 'release/v0.3.0'
correct routes.rb
merge hotfix 0.3.1