Merge pull request #4 from JohnCny/master

merge