some improve
Merge pull request #47 from sabughnaim/master

some improve