Merge pull request #1 from dupejpeter/master

Playing around with merging :D
Merge pull request #2 from Linkyn/master

Merge pull request #1 from dupejpeter/master