Use rest for communication with the pid generator
Merge remote-tracking branch 'origin/master'