Merge branch 'hotfix/fixDetail' into develop
Merge branch 'release/0.1.1'