Merge pull request #22 from sudiptpas/development

merge every thing