Merge pull request #69 from jeffdavidgordon/master

Added additional code to support COA support coming in WET 4.04
Updates to 4.0.6