Added comments, and transfered files from master branch
Merge branches 'master' and 'structured_correct'