More on settings
Merge branch 'master' of https://github.com/tanathos/WhereAmI.git