ready for testing. compiles
Merge branch 'master' of https://github.com/armoredsoftware/protocol