Merge pull request #254 from kberg/i382