fixes for media property
melhorias na pep8
Merge remote-tracking branch 'upstream/master'