Added support for x64, tested on Visual C++ 8 (Visual Studio 2005).
Merge branch 'feature-64bit'
Merge branch 'master' into local