Merge branch 'master' into develop
travis ci misses minitest
travis ci misses minitest
updated minitest
version 0.3.3
Merge branch 'develop'