#33 resolved
#17 B resolved
fixes. Started #17 Б