Merge pull request #10 from typecho/master

同步最新
https://github.com/typecho/typecho/pull/148#issuecomment-31201347
Merge pull request #151 from shingchi/master

洁癖 https://github.com/typecho/typecho/pull/148#issuecomment-31201347