tiket:13 remove bugs from master