fixing bugs
ready to merged in master
stange commit