Merge branch 'release/0.3.3' into develop
Fix python 2.6 support
Update version.
Merge branch 'release/0.3.4'