Version bump to 0.2.0
Version bump to 0.3.0
Version bump to 0.4.0
Version bump to 0.5.0
Version bump to 0.6.0
Version bump to 0.7.0
Version bump to 0.8.0
Version bump to 0.9.0
Version bump to 0.10.0
Version bump to 0.11.0
Version bump to 0.12.0
fixing merge errors
Merge remote-tracking branch 'origin/develop' into develop