Initial commit based on shiroyuki/compositeur