Brickimedia/brickimedia#126 plus some cleanup
Merge branch 'master' of github.com:Brickimedia/LocalSettings