small changes to serializer
Merge branch 'master' of https://github.com/cdhanna/OpCrustBucket