Updated wrapper, should work on macs.