Added log exp
Merge