Merge branch 'release/0.0.1' into develop
change encoding for configuration file
Merge branch 'master' into develop