Merge pull request #1 from tianboyand