build status
Merge pull request #137 from caktux/master

build status
Merge branch 'master' into develop