Revert "Revert "Merge pull request #227 from aesedepece/coseme-update""

This reverts commit 5621379af60b0569e545479a9afbffe7f264b165.