Merge branch 'packaging'
cleanup tool
Merge branch 'packaging'
Merge remote-tracking branch 'original/master'

pulled in upstream changes
removed demo
Merge branch 'pr/4'

Conflicts:
	package.js