20141212 commit branch 1