Merge branch 'hotfix/0.3.1'
Travis button
Merge branch 'master' into develop