Merge branch 'release-0.3.3'
Merge branch 'release-0.3.4'
Merge branch 'release-0.3.5'
Merge branch 'release-0.3.6'
bumped to version 0.3.6
fixes #4
Merge branch 'master' into develop
Merge branch 'develop' into release-0.3.6