Further work to address to address https://github.com/mjordan/pkppln/issues/6.
Merge branch 'master' of github.com:mjordan/pkppln