Fixing PR#123

See conversation in #123 for more details.
Merge pull request #124 from michelsalib/patch-1

Fixing PR#123