Merge branch 'hotfix/0.2.1'
Merge branch 'release/0.3.0'
fixed backwards compatability with python 2
Merge branch 'hotfix/0.3.1' into develop