Added calvcoll
Merge pull request #185 from calvcoll/master

Added calvcoll