Initial proposal to fix #25.

Feedback is welcome.