Merge remote-tracking branch 'ES/master'

Conflicts:
	.gitignore
	README.md