Better format for the license
Merge branch 'hotfix' into devel