Merge pull request #63 from jeffdavidgordon/master

Merge v4.0 into master