fix #101
fix #98
merge