detach settings maybe
Merge pull request #7 from tstein4/master

Pull settings in to master
Merge branch 'settings'