Added image util class
Merge origin/master