Merge origin/master

Conflicts:
	.gitignore
	LICENSE
Merge origin/master