rewrite
Updated license. Cleaned up tests.
Bumped version number.
Merge branch 'develop'

Conflicts:
	LICENSE
	README.md