override fullscreen option
Merge branch 'master' into wellcome