configured setters and getters
Merge branch 'Master2' of https://github.com/Jobs92/Avalon into Master2