Merge branch 'release-0.1'
Merge branch 'release-0.2'
version bump to 0.3
Merge branch 'release-0.3'
update setup.py
Merge branch 'master' into release-0.4
version bump to 0.4
Merge branch 'release-0.4'
Merge branch 'master' into develop