Merge Upstream now!

Please merge upstream. It'll fix a lot of bugs and add new features