Merge pull request #2 from crookedneighbor/master

Here you go.
Merge pull request #2 from leshields/master

blocked!