RastislavKish Merge pull request #5 from sthibaul/i386