merge branch issue-#4