issue class renaming
Merge branch 'master' into full-screen