Fixed compilation under MacOS X, fixed #18
Merge pull request #19 from tucksaun/fix-mac-os-compilation

Fixed compilation under MacOS X, should fix #18