Mask mapalgerbra ticket #2341

Hi,

Build passes on my system, and I have fixed all requested changes!!! Please take another look...

Thanks,

Nathaniel Hunter Clay