Merge pull request #645 from mvriel/psr

Added descriptions and answered TODOs