Merge pull request #6 from maxiaojun/master