fixed code according to new get/set methods
Merge remote-tracking branch 'origin/master'