tarcieri Merge pull request #20 from kluzny/patch-1 …