Merge pull request #1 from imkmf/master

The Pull Request of Fun