Initial commit
Updated license information and homepage link
Merge branch 'upstream'

Conflicts:
	README.md