Merge pull request #255 from kberg/master