Merged pull request for 64bit support