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

PLP feedback