Update core for circplus.
Merge pull request #366 from gsn/master

Update core for circplus.