Merge pull request #2 from Harunoame/master

merging
Merge pull request #3 from Harunoame/denis

Merge pull request #2 from Harunoame/master