Merge pull request #1107 from diogoosorio/develop

Fix issue #1080