Merge pull request #98 from markandrus/develop

Support OS X