finish FAQ - enhancement #186
Merged develop into develop-ak