Changed handling of setters
Merge pull request #117 from shummi/master

Changed handling of setters