Merge pull request #238 from kberg/master