bug fixes
Merge pull request #49 from mediatelecom/bug_fixes

Adjustments