Merge pull request #1 from yoland68/master

Update from original