Merge pull request #7 from ungleich/master