Merge pull request #2 from chameleonsilk/master

Gimmie dat shit again