changes to the configuration setup
Merge branch 'release/0.1.0'

* release/0.1.0:
  changes to the configuration setup