OS X build by Jan Walter