merged in PR 38