Merge pull request #1 from KeironO/master

Moar