support of 64 bit OSX machines
Merge branch 'refs/heads/contribution/OSX64Support'