Fix merge mishaps.
Merge pull request #40 from pfoltyn/pvos/master

Fix merge mishaps.