change stateFile not required
unlink fix
Merge remote-tracking branch 'origin/master'