updated to recent docopt changes