Merge pull request #29 from chzyer/patch-1