Merge pull request #24 from andrewboie/master

Inital x86 support