Work on settings a little
Merge pull request #216 from sammuel86/dev-0.3

Work on settings a little