Merge commit 'osp/only-directories' into homework