Update to readme and makefile
Merge branch 'master' of github.com:armoredsoftware/protocol