Merge pull request #2 from rob0229/master

Merge pull request #1 from rob0229/HEAD