Extract missing getter/setters (#45)
Minor cleanup
Merge pull request #46 from guersam/tmp/fix-accessors

Fix accessors