Merge pull request #34 from Bob-Maestri/Andrew

Correct issue with last merge (blah box)
Correct blah post issue