Refresh with bugfix
Merge pull request #1026 from andrerod/dev

Refresh with bugfix