Added support for 64bit dynamic linking.
Merge remote-tracking branch 'origin/master'