taking pull after fixes
merge fixes
Merge pull request #25 from avneev/feature/plp

Feature/plp