Merge pull request #8 from erickt/fix-deserialization

Fix deserialization of unit variants