Merge branch 'hotfix/1.0.1'
route instead controller
Merge branch 'hotfix/1.0.2' into develop