Merge pull request #539 from bbuchacher/master

Fix - Custom objects cannot be serialized in JSON