Updated library files.
Updated library files.
Updated license.
Merge branch 'develop'

Conflicts:
	README.md
Updated license.