Added License file
Added license info
Added license info
Merge branch 'master' into additional_mapping