Merge pull request #209 from sergiud/cmake-icc-fix