Merge pull request #240 from daenney/manage-preferences