#19 add getter/setter for class define
Merge remote-tracking branch 'origin/master'