Merge pull request #237 from kberg/closure