Merge pull request #132 from peschue/ps

one build fix and one documentation fix