Minor changes after integration.
Merge branch 'master' of github.com:dkorolev/pidlock