Merge pull request #252 from mroswald/refactor/replace-bind-statements-with-class-property-functions replace bind statements