Merge pull request #6 from yehua98/master

pull latest