Merge branch 'protocol-refactored'
Merge pull request #5 from pgn84/master

Merge branch 'protocol-refactored'