added some utils
Merge branch 'master' into Make