Fix #37, #35

Response from PID service was changed, our part of pid generation has
been adapted accordingly.