added try/catch for set
Merge branch 'master' of https://github.com/petele/GoodDrinker