Merge pull request #1 from MehdiK/master

Source update