Merge pull request #160 from J-O-N/fix-neon-cspace-upstream