fixed source code format
fixed reading of options (2)