some improvements
Merge pull request #141 from sudiptpas/sujip

some improvements