Updated source, makefile for x86 and x86_64 is ready