Previous commit fixes #23 and paves the way for #16.