Adapted License-Header
Adapted License-Header
Merge origin/master