Update keywords
Merge branch 'master' of github.com:pierreh/qplayer