Merge pull request #18 from lwanghaol/master

merger
merger for JELLY_BEAN.
Merge pull request #11 from heyongjian/master

merger