Merge branch 'hotfix/0.1.A'
Merge branch 'master' of github.com:sdayu/pumbaa into develop
fix user request