up to date with kivy master