Fixes issue #62
Merge pull request #174 from pbouianov/issue62

Fixes #62