Fix error (typo)
Merge branch 'master' into optimize
stop using File::stat (because instantiating too many File::stat objects was slowing down execution)