Fixing a couple of bugs regarding "options" and making 0 the start depth
Merge branch 'release/2.0.5'