Support for optional mask portion, specified after ? character.
Merge pull request #21 from snappylabs/master

Support for optional-part to a mask