clear the noteMatrix when building a new one, stop the matrix when building
Merge remote-tracking branch 'origin/master' into RedSray