Fixed build conflict
Merge pull request #3 from gonzalezb/development-4.4.4

Fixed build conflict