Merge pull request #152 from heftig/master