Merge pull request #337 from gregdavill/spi-flash