Merge branch 'hotfix/0.2.33'
Merge branch 'release/0.3.0'
Update .travis.yml
Update .travis.yml
Merge branch 'release/0.3.01'
resolved conflict
version format fixed
Merge branch 'hotfix/0.3.3' into develop