20141212 commit 1