bug fixed
merge solved
release 2