Consolidation of pull request #25 (mizipzor).