add var j
added hotfix
Merge branch 'test53'

Conflicts:
	test.js