Merge pull request #56 from JohnCny/master

merge