Update Flag to 0.9, add entity: arg, fixes #333