As requested in #127
As requested in #127