Merge pull request #576 from ey6es/master

Fix for OS X.