20140818 commit 3