Update to use core.matrix 0.0.4