Merge pull request #2 from stephysim/master

test1