merge pull request #2 from iiiyu/develop

 pull request #2 from iiiyu/develop