[daniel_solano]

I'd like to thank Alexander for all of his hard work. It's entirely my fault that his Neko work hasn't been merged in, but it's something I am going to get done soon.