Merge pull request #3 from iauns/master

Correct compilation issues on Mac.