This is a follow-up of #59 . Coincidentally, the next release should be v2.0 (at the time of writing), so maybe a good version to make this happen?
