25May version2

version2
Merge pull request #4 from FrankPrince/master

test
Merge pull request #1 from Aaron-zheng/master

test