lpsmith Merge pull request #2 from ibotty/patch-2 …