2014-6-20 commit 02