resolve merge conflict with #79 (it's a subset of these pull-request)