Some refact in Utilities
Merge pull request #354 from ivandrofly/patch-1.0

Some refact in Utilities [REVERTED]