Merge pull request #209 from kberg/i428