Merge pull request #1 from Trickery94/master

Merge branch