Merge pull request #7 from Negusbuk/master

minor fixes for OSX compatibility