Merging brody's img repo into master