Add utils in lib/*
Fix merge pull