fixing media object
updated and polished
Merge branch 'ds-media-fix'