Merge pull request #368 from hlein/master