Adjusting circplus.
Merge pull request #472 from gsn/master

Adjusting circplus.