Library paths.
Merge remote-tracking branch 'origin/master'
Make to work with 64 bit.