My two cents
Merge pull request #236 from yeco/master

My two cents.