changed layout, added possible output file reader
Merge branch 'beaver'