fix issue 13
fix issue 13
merge