Merge pull request #8 from gsn/staging

Staging
24599 - update sw2 script to call circplus
Merge pull request #362 from cannontech/staging

Staging