Make log_z a class variable.
Merge remote-tracking branch 'origin/master'