Merge pull request #17 from TaoW/master