Revert "Revert 0ef6e8b..7b9f38c"

This reverts commit 547218f943d79ac5c625ec5c68fa72946cf5fdb3.

Conflicts:
	LICENSE