Fixed from_matrix according to the suggestion in #32.
Switched s to be real in from_matrix.
Merge pull request #33 from ColdenCullen/master

Fixed from_matrix according to the suggestion in #32.