Implement feature request from #51.