Merge pull request #3 from pinkelgrg/master

Merge pull request #2 from pinkelgrg/4