fix #8, some minor change