Fix issue #18
Merge branch 'feature-factoids' into develop