add licence and change authors
Merge branch 'develop'