added setup settings
Merge branch 'master' of https://github.com/loed-idzinga/lifefire