Resolve "Фиксы багов"

Merged Daniel requested to merge fixes into master

Closes #21 (closed)

Edited by Daniel

Merge request reports