- removed redundant save/restore
- rewrote masking
- removed redundant save/restore
- rewrote masking
Merge pull request #233 from Animatron/skavish/new-mask

Skavish/new mask