Closes #15 and completes the work for 64bit on Linux and MacOS, I hope.