Fixing broken build issue #583
Merge pull request #744 from psl-felipefarinon/master

Fixing broken build issue #583