General utility updated.
Merging local workspace with master branch