Merge pull request #1 from chameleonsilk/master

Gimmie dat shit
Merge pull request #1 from wankercraft/master

Merge pull request #2 from chameleonsilk/master