Fixed media objects once and for all.
Merge pull request #111 from jdalphon/master

Fixed media objects