Merge remote branch 'origin/master'

Conflicts:
	Makefile
	README.md
Merge remote branch 'origin/master'