fixed github issues 15 and 16

Conflicts:
	test/cursor.js