added options to decompose
added new vars to decompose to hide warnings
Merge branch 'master' of https://github.com/b-stone/M2