Merge branch 'Sotry1_FAQ'

conflicts resolved