Fixing issue #128
Merge pull request #131 from ayrton04/jade-devel

Fixing issue #128