Merge branch 'master' into enhancements

Conflicts:
	index.js