Merge pull request #4 from chengui/master