Fixing merge conflicts in repository
Allowing to use size_t as mask_type, fixing compilation problems