wip
merge squash with connections branch
parse should match line field
Merge branch 'master' into line

Conflicts:
	index.js
Merge branch 'line'