Hohohoh devmode
Merged dev with master.

I have no idea what I'm doin'!