Added -s command line parameter and deprecated the parse function