merge fixes
Merge pull request #87 from avneev/feature/plp

merge fixes