Feature/quick fixes #157

Closed mp-cel closed 3 years ago