Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.js
attempt to undo my previously messed up merge