big messy commit
Merge pull request #8 from kimlai/serializer

big messy commit