General fixes
Merge branch 'master' of https://github.com/cedeo/wimtvpro-wordpress