Haiku patch
Merge pull request #1 from AdrianArroyoCalle/master

Haiku patch