added settings, settings not implemented though
Merge pull request #3 from FakeKane/andrew-settings-1

added settings, settings not implemented though