Fix Encodable/Decodable deprecation warnings
Merge pull request #59 from bfops/master

Fix Encodable/Decodable deprecation warnings