Added myself as an author, since I'm blamed for most of the code by now :P