small fixes
test fixed
everything fine now
Merge remote-tracking branch 'origin/master'