Fixed spaces in __dirname
Merge branch 'dev'