Merge pull request #22 from miqlas/haiku_support

Haiku support