reborn settings
Merge pull request #23 from samjoch/fix-settings

reborn settings