Fix initialization on OS X
Merge pull request #1 from mbauman/osx-init

Fix initialization on OS X