Merge pull request #259 from svost/icc