Fix License
Merge branch 'development'