Port to MAC OS X
Merge pull request #2 from haesbaert/master

Port to MAC OS X