Merge release/v2.0.2 into develop
Complete change started in previous commit and update tests.
Merge pull request #31 from ADmad/develop

Complete change started in previous commit and update tests.
Preparing release
Preparing submodules for release
Updating semver
Finish release
merge release/v2.0.3 into master