change protocol to be as described by Pieter
merge fix
Merge pull request #38 from hjacobs/master

change protocol to be as described by Pieter