uploading a bunch of old updates from my laptop
Merge branch 'master' of https://github.com/smelliott/SPIRLe