changes and improvements
adjust in pyscript
Merge remote-tracking branch 'origin/master'

Conflicts:
	pyscript/pyscript.js