Bug fix
Merge pull request #266 from dalkon/master

Bug fix