Куча мелких злых фиксов
Merge branch 'dev' of https://github.com/ndra/infuso into dev