added pid off/on
Merge origin/master