Merge origin/master

week 12
worked with the HelpFrame and the OptionFrame.