james - repaired k matrix and added sigma matrix.
Merge branch 'assem2'