Merge branch 'release/0.1.21'
stupid settings bug
Merge branch 'master' into develop