Version bump
Version bumps
Merge branch 'master' into 0.1.2
Version bumps