logL.Mat added
fixed conflicts
Merge branch 'clandere-master'
Merge pull request #8 from snoweye/master

logL.Mat added