Merge pull request #46 from brettcannon/patch-2

Update history