Bug fix
Fixing binary marshalling bugs
Merge branch 'feature/restapi' into feature/client
Saving work
Using simpler interface for custom encoding
Bug fixes