update documentation
Merge branch 'new_format'