Mac OS X compilation fixed
Merge pull request #6 from JanSimek/master

Mac OS X compilation