Added count(#15) and isMatrix(#16)