Updated FAQ
merge