Merge branch 'dev'
Better 64-bit platform support, minor bugfixes.