Merge pull request #3 from pinkelgrg/master

pull