Work on issue #4
commit merge