Moar changes
Merge pull request #3 from craftninja/Branchypoo

Moar changes