Update Haiku-2
Merge pull request #1 from c43/master

Update Haiku-2