Added ICP function
Merge branch 'develop'