dougmet Merge pull request #49 from yihui/patch-1