improved code in utility classes
Merge branch 'master' of https://github.com/levants/lightmare.git