20141212 commit 2