fixed #59: put whiff aggregation back in
Merge remote-tracking branch 'upstream/master'