bug fixed and more benchmark tests
merge
merge