merging with subbranch
Fullscreen option
Fullscreen functionality
merged with Steven