Updated markdown formatting
Removed unnecessary option parsing
Merge remote-tracking branch 'upstream/master'