Merge pull request #64 from sudiptpas/sujip

Sujip
some improvement