Added getters and setters
Merge branch 'master' of https://github.com/Tappinn/audubon