adjust description
merged
Conflicts:
	test/parse.coffee