bumps version
Merge branch 'develop' with updated version to 0.2.1.1