Add circplus, remove things we do not use.
silver circplus
Merge pull request #487 from gsn/master

Merged from beta.