Merge pull request #6 from pinkelgrg/master

Merge pull request #5 from pinkelgrg/8