Merge pull request #13 from MRCollective/fix-scalar-bug

Fix execute scalar bug

Passing new massive tests

Fixes GH-2, fixes GH-3