Merge branch 'optimization'

Conflicts:
	package.json