switch from OptionParser to docopt
merge -y handling