Merge remote-tracking branch 'martini/master'

Conflicts:
	LICENSE
	README.md