Initial v4.0
Initial v4.0 code
Merge pull request #37 from jeffdavidgordon/v4.0

V4.0
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md