more testing
Merge branch 'parser' into parserEric

Conflicts:
	README.md