Fixing routes and registration steps
Merge branch 'release/release_0.0.7' into production