fixed issues
Merge branch 'test'

Conflicts:
	main.js