Squashed things by samtrion

I hope this works. If it looks proper (Please @samtrion look over it), this shall close #292 .