Even smarter (without bugs,mainly :P)
Excluding pid files;
Merge branch 'master' into web