Some Fixes
Updated Readme
Merge pull request #7 from kbreidenbach/Settings

Settings