Merge pull request #242 from OdyX/dev-macosx

Mac OSX (Darwin) build support