Fix issues #65 - Fix deserialization method

Closes #65