Fix colpick issue
Update dist
Merge branch 'develop'