Fixed settings error
Bumped version number
Merge branch 'release/0.1.1'