Merge pull request #213 from kberg/i329