fix #16 #17
merge