Added if statements in the set methods
Merge branch 'master' of https://github.com/Tappinn/audubon