Merge pull request #207 from kberg/master