Merge branch 'release/0.1.5' into develop
Merge branch 'develop' of github.com:sdayu/pumbaa into develop