Merge branch 'release/0.1.4' into develop
Merge branch 'master' of github.com:lucifurious/kisma