Added support for i386 architecture
Consolidated i386/x86_64 code
Merge pull request #8 from ridgelift/master

Added support for i386 architecture