Merge pull request #222 from kberg/master