improvements
Merge pull request #110 from sudiptpas/sujip

improvements