Merge pull request #9 from aicl/master

Merge pull request #8 from aicl/develop
Merge pull request #10 from aicl/develop

Merge pull request #9 from aicl/master