fix issue #2
merging