Add bug fixes
Merge pull request #8 from ktn/mediatortest

Add bug fixes