Updated docopt and command line options