some better changes
Merge pull request #125 from sudiptpas/sujip

some better changes