Merge pull request #1 from stephomi/master

merge stephomi‘s code