Merge pull request #33 from Bob-Maestri/Andrew

Andrew
Correct issue with last merge (blah box)