Changed serialization to be more portable
Merge branch 'master' of github.com:TylerSandman/Marvin