Worked on the Cypher SPI
Merge pull request #448 from systay/2.0

Worked on the Cypher SPI