fixes $6
Merge branch 'master' into 4
#4 rultor-spi introduced