Merge branch 'release-0.1'
Bumped version to 0.1.1
Refactored the configuration
Merged hotfix/0.1.1