added get % set methods
Merge remote-tracking branch 'origin/master'