copyright notice
Merge branch 'voisine-master'