Fix for tests on Windows (path fix)
Test & fix for empty files

Conflicts:
	index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.js