Merge pull request #8 from miwara/master

merge