Merge branch 'hotfix/temporary_badness'
Merge branch 'release/0.02'
updated version to reflect changes
Merge branch 'hotfix/version_bump' into develop