Merge branch 'Daniel'
Questions Changes
Merge branch 'master' into Daniel