add missing -n operator
fix language
rename pid/lock files
Merge remote-tracking branch 'origin/master'