Merge pull request #98 from pepf/master

Closes #98