nornagon Merge pull request #2 from Highmongrel/patch-1 …