Shougo Merge pull request #529 from zhuochun/patch-1