Updates to 4.0.6
Merge pull request #71 from jeffdavidgordon/master

Updates to 4.0.6