Merge pull request #2 from panovr/master

Fix VS2013 compiling error c2988 and update Mask submodule pointer