Fixing A1b1) possible ambiguity between Stackmat (as defined) and Stackmat timer
Merge pull request #162 from cubizh/fixes

Fixing A1b1) possible ambiguity with Stackmat (as defined)