Contrib to #102