Merge pull request #26 from sudiptpas/development

Merge pull request #23 from sudiptpas/sudiptpa