issue #6 solved
merge conflict