fixed protoco
updating to use new grammar
Merge pull request #24 from mafintosh/master

working protocol