lilong commit - sprint1

lilong commit - sprint1
Merge pull request #4 from LilongHuang/master

lilong commit - sprint1