Simplifies how masks are re-formatted and allows for more advanced masks
Merge pull request #206 from sudorandom/master

Simplifies how masks are re-formatted and allows for more advanced masks