rebase/merge pr #102