changes to account for not being able to add logarithm
Merge remote-tracking branch 'origin/master'