Fixing issue #126
Merge pull request #128 from esparta/master

Fixing issue #126