Merge pull request #211 from shenki/spi-constraint