Merge pull request #1 from SachaG/master

latest changes