Merge pull request #192 from kberg/master