copy changes
Merge pull request #96 from ninjascience/faq_fix

copy changes