Merge pull request #1 from abao1984/master

merge