Merge pull request #73 from aljoscha/master

Switch to using objects instead of classes for usercode