Merge pull request #2 from aybbou/master

Update