manual merge of #141

fixes #141