faq
Merge pull request #122 from betz/master

faq