Fix issue #29
merge file