refactoring
tabs working good
shape mask order changed for desired result
Merge pull request #1 from vickyturtle/develop

Changed Shape masking logic