Update after merging of #44