Merge pull request #1 from houchker/master

Update
Merge pull request #3 from hichamouchker/master

update