More findbug fixes
Findbugs
Matrix handeling for new matrices
Findbugs
Merge pull request #84 from Bonder-MJ/master

Findbug fixes and matrix handeling