Merge pull request #82 from dailidong/master