Merge pull request #25 from andreas-schwab/master