Merge pull request #3 from jdfreder/settings

Settings