shfil Merge pull request #722 from theR4K/master