fixed#343 bug fixed to close

Hello
I just end up things, and separate to other branches features