Merge branch 'develop'
Added license