Fixed naming conflict in mask and clip modules, bumped to v0.22