Merge pull request #1422 from Yann-lms/genmask

Genmask