Merge pull request #153 from KurtStam/master

commenting out test