Merge pull request #186 from kberg/master