Alex's changes to allow OS X
Merge pull request #1 from dmazin/master

Alex's changes to allow OS X