Merge pull request #1 from Mourakiboun/master