merging Jasen's changes that clarify the mask attribute. closes #67.