Cleanup
Doc: Licence and readme
Merge branch 'master' into devel