solved issue #9
merge