Bug fix
Merge pull request #212 from dalkon/master

Bug fix