Bugfix: flag collision (rev. 1)
Added suport for onliners data file (rev. 1)

Signed-off-by: nixnodes <code@eth.si>