Merge branch 'release/v0.1.0' into develop
Merge branch 'master' into develop
merge
.
.
.
Made modules more configurable
Unified modules
Bumped version
Merge branch 'release/v0.2.0'