Further implement EntityDeserializer
Merge pull request #22 from wmde/EntityDeserializer

Further implement EntityDeserializer