fix ontouch
update url
Extract utils lib
Merge branch dev