refactored Matrix.row and Matrix.column
fix broken py3 build