Change argument unpacking, add transform function, closes #1