Fixes #139 - Implementing Media Object