Sandworm's edit, v2

Improves the spares patch
Merge pull request #71 from Ippo343/SandwormEdit

Sandworm's edit, v2