Place back circplus, make sure columns are in sync.
Merge pull request #428 from gsn/master

Place back circplus, make sure columns are in sync.