Merge "LICENSE file added"