Undoing my BIG derp...

man.... I'm the biggest derp ever >.>
Merge pull request #56 from iMarbot/master

Undoing my BIG derp...