Merge branch 'release/1.0.2' into develop
Merge branch 'master' into develop
Added tests
bumped version
Merge branch 'release/1.0.3'