ConradIrwin Merge pull request #40 from zotherstupidguy/patch-1 …