Merge pull request #1 from yearster/master

My "pull request"