Merge pull request #2 from aicl/master

develop branch