Merge pull request #3 from snoweye/master

test