Merge pull request #1 from essarraj-fouad/master

update from essarraj
Merge pull request #4 from madanitanger/master

Merge pull request #1 from essarraj-fouad/master