wesbarnett Merge pull request #73 from tlvince/patch-1