Code refactored a little (issue #174)
Discovered errors in decomposers (#213)