Added support for GFM, altered command-line arguments