Merge branch 'recursive_depth'
quick edit to match existing naming conventions
use docopt default options