Merge pull request #1 from Elyotna/master

merge to latest