add a license
Merge remote-tracking branch 'marc/master'