Remove custom getter / setters, so KVO works properly, issue #20