bugfixes etc
Merge branch 'master' of github.com:sebastianHi/ubimedia