FAQ page and some code cleaning
Merge pull request #130 from raziraz/master

FAQ page and some code cleaning