checked potential segfault
Merge branch 'master' of https://github.com/mks65-dw/dirinfo
merged last two commits (diff machines)