Merge branch 'release/0.2' into develop
Merge branch 'master' into develop
removed text dependency
bumped version number
Merge branch 'release/2.1'