added the code to remove the infinities from the aggregated features.
Merge branch 'ShabihsBranch'