a bit more merging with the previous dmitry/master line
Merged in changes from 975b5dc: formatting and listDeep flag for recursive directory checking