Fixing issue #107
Merge pull request #113 from hpatoio/master

Proposal to fix issue #107