Merge pull request #1 from siddontang/master

test