Merge pull request #236 from stayradiated/master

Update
Merge pull request #237 from stayradiated/syncing_prefs

Merge pull request #236 from stayradiated/master