Moar work
Merge pull request #2 from Reshurum/work

Moar work