rm pid.tmp. use /tmp/pid.tmp
Merge branch 'develop'