add license
merging license from master