Merge pull request #155 from kberg/master