alexcrichton Merge pull request #90 from alexreg/cosmetic-2 …