Added @shanselman stuff
Merge pull request #20 from shanselman/patch-1

Added @shanselman stuff