Combine x86 and x64 code
Merge pull request #8 from JayXon/master

Combine x86 and x64 code.