Changed some weird lines of code, when I get a time machine, I'll ask myself in 2012 why...
Updated gradle build file