Merge pull request #268 from davipt/master

Fix compilation for MacOSX and Oracle's JVM