add replace colon function
Merge branch 'develop'