Adding index and files parameters to forEachInDir callback
Merge branch 'hotfix/0.4.1'