.
Merge pull request #2 from Wyn10/master

Changes