Merge pull request #39 from andreas-schwab/master