Adding Ubuntu and x64 support