Merge changes from mohae:master

Mohae did some good working cleaning things up and making them better, so let's use them!