Merge pull request #2 from k4733294/bugfix

fff