shfil Merge pull request #715 from Nick007J/master