PLP feedback
Merge pull request #46 from avneev/feature/plp

PLP feedback