Iss1/wikipedia

(fixes #1 )