Merge pull request #96 from gdqyn/master

Sep 2 patch
daily translating patch sep 2
pull from commandlinefu.com
daily translating patch sep 3
daily translating patch sep 4
Merge pull request #7 from tg123/master

update