issue#63 resolve conflict
issue#63 resolve conflict

uclouvain/osis_louvain,uclouvain/OSIS-Louvain,uclouvain/osis_louvain,uclouvain/OSIS-Louvain,uclouvain/osis,uclouvain/osis,uclouvain/osis_louvain,uclouvain/osis,uclouvain/OSIS-Louvain,uclouvain/osis