some improvements
Merge pull request #121 from sudiptpas/himanshu

some improvements