fix #3
merge