Merge pull request #1 from Wryxo/feature2

SPAM!