Hurp all the durps
Merge pull request #269 from Zerokyuuni/master

Hurp all the durps