init format guessing
Merge branch 'master' into jfmcarreira-dev