Fixed masking for meshfill
Merge branch 'issue_555_updated_for_meshfill' into devel