init format guessing
Fix license header and minor change in files description
Merge branch 'master' into jfmcarreira-dev
Minor bugfix after files changes