微調整
Merge branch '20131013'