Merge pull request #9 from jiangxiaoli/dev_sammie

Dev sammie