Part of settings implementation
Merge branch 'master' of github.com:djerbic/ovan