* Changed modifier of some members
Changed modifier of some members
Merge branch 'Zeliret-master'
Rename a class member and a getter