Fix invalid bins
Fixing scripts
Merge branch '1.0'

Conflicts:
	package.json