R9676
Merge pull request #23 from heugabel/master

Works with R9676