add license text
Merge branch 'changes' into develop