fix #32
merge conflicts