Merge branch 'master' into working
Licence file

added text version
Merge branch 'working'