更新注释
更新
20140831更新
Merge remote-tracking branch 'origin/master'