add reference with article of wikipedia
pre merge
fix merge conflit