fixed: double suffix for pid file
Merge branch 'next'