Merge PRs

Hey,

There's some good PRs here that should be merged into the repo. Considering that this project has 1.3k stars, I think it would be a benefit to a lot of developers if some of the fixes as proposed by those PRs were implemented.