Merge pull request #1 from dupejpeter/master

Playing around with merging :D