Extra negation. Whoops.
Merge remote-tracking branch 'upstream/master'
Added code for units in data driven problem author