Merge pull request #5 from pinkelgrg/8

8