Fix for #31. Additional cleanup to serializer
Merge branch 'master' into virtual_collections