fixed licens
Merge branch 'work'