Merge pull request #29 from MartyBurns/master

fixed martys sandbox tests
additional refinement
Merge pull request #30 from RonPasquarelli/master

additional refinement