Just merged in 3 pull requests from @vincent. Good week for bug fixes. 🎉

Manton Reece @manton