Fixed transposing and added Hermitian conjugation
Merge branch 'solid'