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

v0.01b