FAQ update
Merge pull request #364 from elihart/faq

FAQ update