Merge pull request #3 from PikadudeNo1/patch-1