Fixes #415
Merge pull request #416 from vinimdocarmo/issue-415

Fixes #415