Fix for #244 and #245
Merge pull request #246 from jdalphon/master

Media Object bug fixes