Ispravke bugova: #37, #40, #42, #50, #53