Matrixfixes

Esi Zaimirequested to merge
matrixfixes into master

fixed the matrix pricing and the package pricing.

Merge request reports