Merge origin/master

Conflicts:
	.gitignore
	LICENSE
	README.md