Merge pull request #6 from JonMidhir/refactor

Refactor
Serializable attributes should assign the properties they're responsible for