Mess with Sam's code
Merge pull request #3 from Kyuhl/patch-1

Mess with Sam's code