Merge pull request #2 from Harunoame/master

merging