Merge branch kaosmicadei-Pythonic