Import issue #135 as a start