preferences fix
Merge branch 'master' of github.com:jualjiman/fortaleza