improve naming, use better code generation
add unit test
Merge pull request #48 from CapillarySoftware/new_protobuffer_format

improve naming, use better code generation