Update Makefile
Update parsing command line arguments
Update benchmark