Official push, this version should work and fix most bugs