Hopefully fixing shit
wat
Merge pull request #14 from Excolo/dev

Dev