Fixed missing markers.
Added documentation of --conf= command line argument.