Merge pull request #1 from yearster/master

My "pull request"
Merge pull request #2 from chezeric/master

Merge pull request #1 from yearster/master