Merge pull request #2 from Elyotna/master

#2