A bit of general maintenance, mainly related to issue #69
Use pl here
Merge pull request #84 from mkoppanen/master

A bit of general maintenance, mainly related to issue #69