group4 ver2
Merge pull request #15 from jingfei/master

group4 ver2