Bugs caught by Jody
Merge branch 'master' of https://github.com/mmellis/rSPACE