Small bug fixes.
Merge branch 'master' of https://github.com/DSVProject/DSVProject

Conflicts:
	test/queueArray.html