Issue #42

I think after code review this pull request is just a formality.