changes to serializer
Merge origin/master