Merge pull request #8 from miwara/master

merge
Merge pull request #9 from miwara/dev_env

Merge pull request #8 from miwara/master