Implemented #47
Merge branch 'master' into 41-unicode-serializers