Added options to allow compilation on OS X
Merge pull request #2 from jansc/master

Added options to allow compilation on OS X