better mask handling
better mask handling
Merge pull request #14 from jmcriffey/master

Better mask handling