Merge "add fullscreen option"