bugfix: default without output_format is simple
Merge branch 'development'