fix issue #26
merge