new feature
bumped version number
Merge branch 'release-1.2' into develop