solving Issue #2 and more.
merge

merge