Merge pull request #22 from sudiptpas/development

merge every thing
Merge pull request #23 from sudiptpas/sudiptpa

Merge pull request #22 from sudiptpas/development