Merge pull request #7 from aicl/master

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

Merge pull request #7 from aicl/master