Added getters
merge master
new feature on new branch