merge appleorange1/licence_issue in master