Merge pull request #2 from aicl/master

develop branch
Merge pull request #3 from aicl/develop

Merge pull request #2 from aicl/master