Merge pull request #224 from kberg/i294