Merge pull request #14 from udam/develop

Develop
Merge pull request #17 from udam/develop

Develop
revise