worked on settings
Merge pull request #96 from Northcode/dev-Andreas

worked on settings