Merge pull request #184 from kberg/master