Upgrade to Cilantro 2.2.15
Merge pull request #128 from cbmi/issue-127

Upgrade to Cilantro 2.2.15