Fixing issue #128
Merge pull request #132 from ayrton04/indigo-devel

Fixing issue #128