Merge branch 'release/1.0.1' into develop
Fixed config retrieval
Bumped version number
Merge branch 'release/1.0.2'