Merge with flosch/pongo2