Merge remote-tracking branch 'james/master'

Conflicts:
	src/Loaction.js
Merge error