output formats update
Merge git://github.com/jensvoid/lorg