Fixed settings setup
Merge branch 'hotfix/v0.01b'