x86 support
Merge pull request #29 from efmoyano/master

x86 support