Refactor and fix stupidities in parse
Add protocol not parseable test
Merge pull request #94 from adamvr/fix-parse

Fix parse