Merge pull request #98 from karlp/master