v1.6

Conflicts:
	package.json
	spec/test.coffee