merge gh-issue-43