Try fixing MacOSX issue.

See #52
Merge branch 'develop'