Updated to docopt 0.6.16