Feature/spifix

This also includes the other pull request, I had to already merge it locally in my fork to be able to work, am still waiting for #101 to be merged.