fix bug
fix issue #13
merge