Merge pull request #133 from clehner/master